regenerate smp-alt.patch for 2.6.12

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/patches/linux-2.6.12/smp-alts.patch b/patches/linux-2.6.12/smp-alts.patch
index 5d18c5e71a75a59c8d5e7e2f141b1c2770973b3f..27c8f99d09d4328709b90b07b49eac3d6ab28e9b 100644 (file)
--- a/patches/linux-2.6.12/smp-alts.patch
+++ b/patches/linux-2.6.12/smp-alts.patch
@@ -1,7 +1,7 @@
-diff -Naur linux-2.6.11/arch/i386/Kconfig linux-2.6.11.post/arch/i386/Kconfig
---- linux-2.6.11/arch/i386/Kconfig     2005-03-02 07:37:49.000000000 +0000
-+++ linux-2.6.11.post/arch/i386/Kconfig        2005-06-10 13:42:35.000000000 +0100
-@@ -481,6 +481,19 @@
+diff -Naur linux-2.6.12/arch/i386/Kconfig linux-2.6.12.post/arch/i386/Kconfig
+--- linux-2.6.12/arch/i386/Kconfig     2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/arch/i386/Kconfig        2005-07-25 05:51:21.000000000 -0400
+@@ -487,6 +487,19 @@
  
          If you don't know what to do here, say N.
  
@@ -21,10 +21,10 @@ diff -Naur linux-2.6.11/arch/i386/Kconfig linux-2.6.11.post/arch/i386/Kconfig
  config NR_CPUS
        int "Maximum number of CPUs (2-255)"
        range 2 255
-diff -Naur linux-2.6.11/arch/i386/kernel/Makefile linux-2.6.11.post/arch/i386/kernel/Makefile
---- linux-2.6.11/arch/i386/kernel/Makefile     2005-03-02 07:37:49.000000000 +0000
-+++ linux-2.6.11.post/arch/i386/kernel/Makefile        2005-06-16 11:16:18.555332435 +0100
-@@ -32,6 +32,7 @@
+diff -Naur linux-2.6.12/arch/i386/kernel/Makefile linux-2.6.12.post/arch/i386/kernel/Makefile
+--- linux-2.6.12/arch/i386/kernel/Makefile     2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/arch/i386/kernel/Makefile        2005-07-25 05:51:21.000000000 -0400
+@@ -33,6 +33,7 @@
  obj-$(CONFIG_HPET_TIMER)      += time_hpet.o
  obj-$(CONFIG_EFI)             += efi.o efi_stub.o
  obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
@@ -32,9 +32,9 @@ diff -Naur linux-2.6.11/arch/i386/kernel/Makefile linux-2.6.11.post/arch/i386/ke
  
  EXTRA_AFLAGS   := -traditional
  
-diff -Naur linux-2.6.11/arch/i386/kernel/smpalts.c linux-2.6.11.post/arch/i386/kernel/smpalts.c
---- linux-2.6.11/arch/i386/kernel/smpalts.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.11.post/arch/i386/kernel/smpalts.c       2005-06-16 11:23:39.300902424 +0100
+diff -Naur linux-2.6.12/arch/i386/kernel/smpalts.c linux-2.6.12.post/arch/i386/kernel/smpalts.c
+--- linux-2.6.12/arch/i386/kernel/smpalts.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.12.post/arch/i386/kernel/smpalts.c       2005-07-25 05:51:21.000000000 -0400
 @@ -0,0 +1,85 @@
 +#include <linux/kernel.h>
 +#include <asm/system.h>
@@ -121,10 +121,10 @@ diff -Naur linux-2.6.11/arch/i386/kernel/smpalts.c linux-2.6.11.post/arch/i386/k
 +      asm volatile ("jmp 1f\n1:");
 +      mb();
 +}
-diff -Naur linux-2.6.11/arch/i386/kernel/smpboot.c linux-2.6.11.post/arch/i386/kernel/smpboot.c
---- linux-2.6.11/arch/i386/kernel/smpboot.c    2005-03-02 07:38:09.000000000 +0000
-+++ linux-2.6.11.post/arch/i386/kernel/smpboot.c       2005-06-16 11:17:09.287064617 +0100
-@@ -1003,6 +1003,11 @@
+diff -Naur linux-2.6.12/arch/i386/kernel/smpboot.c linux-2.6.12.post/arch/i386/kernel/smpboot.c
+--- linux-2.6.12/arch/i386/kernel/smpboot.c    2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/arch/i386/kernel/smpboot.c       2005-07-25 05:51:21.000000000 -0400
+@@ -1001,6 +1001,11 @@
                if (max_cpus <= cpucount+1)
                        continue;
  
@@ -136,7 +136,7 @@ diff -Naur linux-2.6.11/arch/i386/kernel/smpboot.c linux-2.6.11.post/arch/i386/k
                if (do_boot_cpu(apicid))
                        printk("CPU #%d not responding - cannot use it.\n",
                                                                apicid);
-@@ -1118,6 +1123,11 @@
+@@ -1130,6 +1135,11 @@
                return -EIO;
        }
  
@@ -148,9 +148,9 @@ diff -Naur linux-2.6.11/arch/i386/kernel/smpboot.c linux-2.6.11.post/arch/i386/k
        local_irq_enable();
        /* Unleash the CPU! */
        cpu_set(cpu, smp_commenced_mask);
-diff -Naur linux-2.6.11/arch/i386/kernel/vmlinux.lds.S linux-2.6.11.post/arch/i386/kernel/vmlinux.lds.S
---- linux-2.6.11/arch/i386/kernel/vmlinux.lds.S        2005-03-02 07:38:37.000000000 +0000
-+++ linux-2.6.11.post/arch/i386/kernel/vmlinux.lds.S   2005-06-10 11:14:14.000000000 +0100
+diff -Naur linux-2.6.12/arch/i386/kernel/vmlinux.lds.S linux-2.6.12.post/arch/i386/kernel/vmlinux.lds.S
+--- linux-2.6.12/arch/i386/kernel/vmlinux.lds.S        2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/arch/i386/kernel/vmlinux.lds.S   2005-07-25 05:51:21.000000000 -0400
 @@ -30,6 +30,13 @@
    __ex_table : { *(__ex_table) }
    __stop___ex_table = .;
@@ -165,9 +165,9 @@ diff -Naur linux-2.6.11/arch/i386/kernel/vmlinux.lds.S linux-2.6.11.post/arch/i3
    RODATA
  
    /* writeable */
-diff -Naur linux-2.6.11/include/asm-i386/atomic.h linux-2.6.11.post/include/asm-i386/atomic.h
---- linux-2.6.11/include/asm-i386/atomic.h     2005-03-02 07:37:51.000000000 +0000
-+++ linux-2.6.11.post/include/asm-i386/atomic.h        2005-06-13 10:10:39.000000000 +0100
+diff -Naur linux-2.6.12/include/asm-i386/atomic.h linux-2.6.12.post/include/asm-i386/atomic.h
+--- linux-2.6.12/include/asm-i386/atomic.h     2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/include/asm-i386/atomic.h        2005-07-25 05:51:21.000000000 -0400
 @@ -4,18 +4,13 @@
  #include <linux/config.h>
  #include <linux/compiler.h>
@@ -188,9 +188,9 @@ diff -Naur linux-2.6.11/include/asm-i386/atomic.h linux-2.6.11.post/include/asm-
  /*
   * Make sure gcc doesn't try to be clever and move things around
   * on us. We need to use _exactly_ the address the user gave us,
-diff -Naur linux-2.6.11/include/asm-i386/bitops.h linux-2.6.11.post/include/asm-i386/bitops.h
---- linux-2.6.11/include/asm-i386/bitops.h     2005-03-02 07:38:12.000000000 +0000
-+++ linux-2.6.11.post/include/asm-i386/bitops.h        2005-06-13 10:11:54.000000000 +0100
+diff -Naur linux-2.6.12/include/asm-i386/bitops.h linux-2.6.12.post/include/asm-i386/bitops.h
+--- linux-2.6.12/include/asm-i386/bitops.h     2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/include/asm-i386/bitops.h        2005-07-25 05:51:21.000000000 -0400
 @@ -7,6 +7,7 @@
  
  #include <linux/config.h>
@@ -266,9 +266,9 @@ diff -Naur linux-2.6.11/include/asm-i386/bitops.h linux-2.6.11.post/include/asm-
                "btcl %2,%1\n\tsbbl %0,%0"
                :"=r" (oldbit),"=m" (ADDR)
                :"Ir" (nr) : "memory");
-diff -Naur linux-2.6.11/include/asm-i386/rwsem.h linux-2.6.11.post/include/asm-i386/rwsem.h
---- linux-2.6.11/include/asm-i386/rwsem.h      2005-03-02 07:38:08.000000000 +0000
-+++ linux-2.6.11.post/include/asm-i386/rwsem.h 2005-06-13 10:13:06.000000000 +0100
+diff -Naur linux-2.6.12/include/asm-i386/rwsem.h linux-2.6.12.post/include/asm-i386/rwsem.h
+--- linux-2.6.12/include/asm-i386/rwsem.h      2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/include/asm-i386/rwsem.h 2005-07-25 05:51:21.000000000 -0400
 @@ -40,6 +40,7 @@
  
  #include <linux/list.h>
@@ -349,9 +349,9 @@ diff -Naur linux-2.6.11/include/asm-i386/rwsem.h linux-2.6.11.post/include/asm-i
                : "+r"(tmp), "=m"(sem->count)
                : "r"(sem), "m"(sem->count)
                : "memory");
-diff -Naur linux-2.6.11/include/asm-i386/smp_alt.h linux-2.6.11.post/include/asm-i386/smp_alt.h
---- linux-2.6.11/include/asm-i386/smp_alt.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.11.post/include/asm-i386/smp_alt.h       2005-06-16 11:16:50.109433206 +0100
+diff -Naur linux-2.6.12/include/asm-i386/smp_alt.h linux-2.6.12.post/include/asm-i386/smp_alt.h
+--- linux-2.6.12/include/asm-i386/smp_alt.h    1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.12.post/include/asm-i386/smp_alt.h       2005-07-25 05:51:21.000000000 -0400
 @@ -0,0 +1,32 @@
 +#ifndef __ASM_SMP_ALT_H__
 +#define __ASM_SMP_ALT_H__
@@ -385,9 +385,9 @@ diff -Naur linux-2.6.11/include/asm-i386/smp_alt.h linux-2.6.11.post/include/asm
 +#endif
 +
 +#endif /* __ASM_SMP_ALT_H__ */
-diff -Naur linux-2.6.11/include/asm-i386/spinlock.h linux-2.6.11.post/include/asm-i386/spinlock.h
---- linux-2.6.11/include/asm-i386/spinlock.h   2005-03-02 07:37:50.000000000 +0000
-+++ linux-2.6.11.post/include/asm-i386/spinlock.h      2005-06-13 14:13:52.000000000 +0100
+diff -Naur linux-2.6.12/include/asm-i386/spinlock.h linux-2.6.12.post/include/asm-i386/spinlock.h
+--- linux-2.6.12/include/asm-i386/spinlock.h   2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/include/asm-i386/spinlock.h      2005-07-25 05:51:21.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <asm/page.h>
  #include <linux/config.h>
@@ -467,9 +467,9 @@ diff -Naur linux-2.6.11/include/asm-i386/spinlock.h linux-2.6.11.post/include/as
  
  static inline int _raw_read_trylock(rwlock_t *lock)
  {
-diff -Naur linux-2.6.11/include/asm-i386/system.h linux-2.6.11.post/include/asm-i386/system.h
---- linux-2.6.11/include/asm-i386/system.h     2005-03-02 07:37:30.000000000 +0000
-+++ linux-2.6.11.post/include/asm-i386/system.h        2005-06-15 13:21:40.000000000 +0100
+diff -Naur linux-2.6.12/include/asm-i386/system.h linux-2.6.12.post/include/asm-i386/system.h
+--- linux-2.6.12/include/asm-i386/system.h     2005-06-17 15:48:29.000000000 -0400
++++ linux-2.6.12.post/include/asm-i386/system.h        2005-07-25 05:51:21.000000000 -0400
 @@ -5,7 +5,7 @@
  #include <linux/kernel.h>
  #include <asm/segment.h>